*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a7d90921f52035cdc38cf8cec0bdad61ef6264a..c9a884fca6149fdc1b38019b9573fdf16093373b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-30  Juanma Barranquero  <lektu@terra.es>
+
+       * smerge-mode.el (smerge-diff-switches): Fix typo in docstring.
+
 2004-04-30  Mario Lang  <mlang@delysid.org>
 
        * diff.el (diff-switches): Fix typo in docstring.